Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 25 Apr 2010 22:47:31 +0000 (22:47 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 25 Apr 2010 22:47:31 +0000 (22:47 +0000)

Trivial merge